Merge "Prevent OutputPage::addWikiText and friends from causing UNIQ fails"

diff --combined includes/OutputPage.php
index a2b8920,815ac12..2a96891
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -1608,7 -1608,7 +1608,7 @@@ class OutputPage extends ContextSource 
                $oldTidy = $popts->setTidy( $tidy );
                $popts->setInterfaceMessage( (bool)$interface );
  
-               $parserOutput = $wgParser->parse(
+               $parserOutput = $wgParser->getFreshParser()->parse(
                        $text, $title, $popts,
                        $linestart, true, $this->mRevisionId
                );
@@@ -1621,24 -1621,11 +1621,24 @@@
        }
  
        /**
 -       * Add a ParserOutput object, but without Html
 +       * Add a ParserOutput object, but without Html.
         *
 +       * @deprecated since 1.24, use addParserOutputMetadata() instead.
         * @param ParserOutput $parserOutput
         */
        public function addParserOutputNoText( &$parserOutput ) {
 +              $this->addParserOutputMetadata( $parserOutput );
 +      }
 +
 +      /**
 +       * Add all metadata associated with a ParserOutput object, but without the actual HTML. This
 +       * includes categories, language links, ResourceLoader modules, effects of certain magic words,
 +       * and so on.
 +       *
 +       * @since 1.24
 +       * @param ParserOutput $parserOutput
 +       */
 +      public function addParserOutputMetadata( &$parserOutput ) {
                $this->mLanguageLinks += $parserOutput->getLanguageLinks();
                $this->addCategoryLinks( $parserOutput->getCategories() );
                $this->mNewSectionLink = $parserOutput->getNewSection();
@@@ -1686,50 -1673,21 +1686,50 @@@
        }
  
        /**
 -       * Add a ParserOutput object
 +       * Add the HTML and enhancements for it (like ResourceLoader modules) associated with a
 +       * ParserOutput object, without any other metadata.
 +       *
 +       * @since 1.24
 +       * @param ParserOutput $parserOutput
 +       */
 +      public function addParserOutputContent( &$parserOutput ) {
 +              $this->addParserOutputText( $parserOutput );
 +
 +              $this->addModules( $parserOutput->getModules() );
 +              $this->addModuleScripts( $parserOutput->getModuleScripts() );
 +              $this->addModuleStyles( $parserOutput->getModuleStyles() );
 +              $this->addModuleMessages( $parserOutput->getModuleMessages() );
 +
 +              $this->addJsConfigVars( $parserOutput->getJsConfigVars() );
 +      }
 +
 +      /**
 +       * Add the HTML associated with a ParserOutput object, without any metadata.
 +       *
 +       * @since 1.24
 +       * @param ParserOutput $parserOutput
 +       */
 +      public function addParserOutputText( &$parserOutput ) {
 +              $text = $parserOutput->getText();
 +              wfRunHooks( 'OutputPageBeforeHTML', array( &$this, &$text ) );
 +              $this->addHTML( $text );
 +      }
 +
 +      /**
 +       * Add everything from a ParserOutput object.
         *
         * @param ParserOutput $parserOutput
         */
        function addParserOutput( &$parserOutput ) {
 -              $this->addParserOutputNoText( $parserOutput );
 +              $this->addParserOutputMetadata( $parserOutput );
                $parserOutput->setTOCEnabled( $this->mEnableTOC );
  
                // Touch section edit links only if not previously disabled
                if ( $parserOutput->getEditSectionTokens() ) {
                        $parserOutput->setEditSectionTokens( $this->mEnableSectionEditLinks );
                }
 -              $text = $parserOutput->getText();
 -              wfRunHooks( 'OutputPageBeforeHTML', array( &$this, &$text ) );
 -              $this->addHTML( $text );
 +
 +              $this->addParserOutputText( $parserOutput );
        }
  
        /**
@@@ -1768,7 -1726,7 +1768,7 @@@
                        $oldLang = $popts->setTargetLanguage( $language );
                }
  
-               $parserOutput = $wgParser->parse(
+               $parserOutput = $wgParser->getFreshParser()->parse(
                        $text, $this->getTitle(), $popts,
                        $linestart, true, $this->mRevisionId
                );

diff --combined includes/parser/Parser.php
index 61fd9cc,a9e2a3b..fa5d678
--- 1/includes/parser/Parser.php
--- 2/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@@ -1876,7 -1876,6 +1876,7 @@@ class Parser 
         * @private
         */
        function replaceInternalLinks2( &$s ) {
 +              global $wgExtraInterlanguageLinkPrefixes;
                wfProfileIn( __METHOD__ );
  
                wfProfileIn( __METHOD__ . '-setup' );
@@@ -2097,12 -2096,11 +2097,12 @@@
                        if ( $noforce ) {
                                # Interwikis
                                wfProfileIn( __METHOD__ . "-interwiki" );
 -                              if ( $iw && $this->mOptions->getInterwikiMagic()
 -                                      && $nottalk && Language::fetchLanguageName( $iw, null, 'mw' )
 +                              if (
 +                                      $iw && $this->mOptions->getInterwikiMagic() && $nottalk && (
 +                                              Language::fetchLanguageName( $iw, null, 'mw' ) ||
 +                                              in_array( $iw, $wgExtraInterlanguageLinkPrefixes )
 +                                      )
                                ) {
 -                                      // XXX: the above check prevents links to sites with identifiers that are not language codes
 -
                                        # Bug 24502: filter duplicates
                                        if ( !isset( $this->mLangLinkLanguages[$iw] ) ) {
                                                $this->mLangLinkLanguages[$iw] = true;
@@@ -5339,7 -5337,7 +5339,7 @@@
                                                        } else {
                                                                $localLinkTitle = Title::newFromText( $linkValue );
                                                                if ( $localLinkTitle !== null ) {
 -                                                                      $link = $localLinkTitle->getLocalURL();
 +                                                                      $link = $localLinkTitle->getLinkURL();
                                                                }
                                                        }
                                                        break;
@@@ -6335,4 -6333,23 +6335,23 @@@
  
                return $html;
        }
+ 
+       /**
+        * Return this parser if it is not doing anything, otherwise
+        * get a fresh parser. You can use this method by doing
+        * $myParser = $wgParser->getFreshParser(), or more simply
+        * $wgParser->getFreshParser()->parse( ... );
+        * if you're unsure if $wgParser is safe to use.
+        *
+        * @since 1.24
+        * @return Parser A parser object that is not parsing anything
+        */
+       public function getFreshParser() {
+               global $wgParserConf;
+               if ( $this->mInParse ) {
+                       return new $wgParserConf['class']( $wgParserConf );
+               } else {
+                       return $this;
+               }
+       }
  }